308. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-07-12 04:43:08 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

308.1 Files compared

#LocationFileLast Modified
1Porto v4.0.5/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Theme/page_layout3columns.xml2021-06-10 08:46:52 +0000
2Porto v4.0.6/Theme Files/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Theme/page_layout3columns.xml2023-07-03 04:21:14 +0000

308.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged278
Changed00
Inserted114
Removed00

308.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

308.4 Active regular expressions

No regular expressions were active.

308.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4 <!-- 4 <!--
5 /** 5 /**
6  * Copyright © Magento, Inc. All rights reserved. 6  * Copyright © Magento, Inc. All rights reserved.
7  * See COPYING.txt for license details. 7  * See COPYING.txt for license details.
8  */ 8  */
9 --> 9 -->
10 <layout  10 <layout 
11  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  11  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
12  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd" 12  xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd"
13 > 13 >
14       14      
15  <update  15  <update 
16   handle="2columns-left" 16   handle="2columns-left"
17  /> 17  />
18       18      
19  <referenceContainer  19  <referenceContainer 
    20   name="sidebar.second"
    21  >
    22           
    23   <block 
    24    class="Smartwave\Porto\Block\Template" 
    25    name="sidebar_second_block" 
    26    after="-" 
    27    template="Smartwave_Porto::custom_block.phtml" 
    28    ifconfig="porto_settings/general/sidebar_second_block"
    29   />
    30       
    31  </referenceContainer>
    32      
    33  <referenceContainer 
20   name="columns" 34   name="columns"
21  > 35  >
22            36           
23   <container  37   <container 
24    name="div.sidebar.second"  38    name="div.sidebar.second" 
25    htmlTag="div"  39    htmlTag="div" 
26    htmlClass="sidebar sidebar-second"  40    htmlClass="sidebar sidebar-second" 
27    after="div.sidebar.main" 41    after="div.sidebar.main"
28   > 42   >
29                 43                
30    <container  44    <container 
31     name="sidebar.second 45     name="sidebar.second
32     as="sidebar_second"  46     as="sidebar_second" 
33     label="Sidebar Secondary" 47     label="Sidebar Secondary"
34    /> 48    />
35             49            
36   </container> 50   </container>
37        51       
38  </referenceContainer> 52  </referenceContainer>
39 </layout> 53 </layout>